Adwaita: Fix active spinbutton button image color

The spinbutton>button>image is currently blue when the image is clicked
and dark-ish when the button is clicked(but not the image). This was not
the case before since we didn't even propagate :active down to the image
child. Fix this by only applying the blue color to direct image children
of entries.

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 0cca57dbfa02f8803403b95158ccea18d5315d92..6628a901004f202eeb14bfb1522d6b7c327f4a27 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -357,7 +357,7 @@ entry {
       }
     }
 
-    image { // entry icons colors
+    > image { // entry icons colors
       color: mix($fg_color, $base_color, 80%);
 
       &:hover { color: $fg_color; }

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 66096e0f9b51cee9305ac5d28d4c2f7465696797..8f6daa89ef645baf841e20285bb8e7b93683b0c3 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1,6 +1,6 @@
 * { padding: 0; -gtk-secondary-caret-color: #15539e; }
 
-button:focus(visible), checkbutton:focus(visible), radiobutton:focus(visible), switch:focus(visible), scale:focus(visible), label:focus(visible), row:focus(visible), flowboxchild:focus(visible) { outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 3px; }
+modelbutton:focus(visible), button:focus(visible), checkbutton:focus(visible), radiobutton:focus(visible), switch:focus(visible), scale:focus(visible), label:focus(visible), row:focus(visible), flowboxchild:focus(visible) { outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 3px; }
 
 /*************** Base States * */
 .background { color: #eeeeec; background-color: #353535; }
@@ -137,13 +137,13 @@ spinbutton.warning:focus:not(.vertical), spinbutton.vertical text.warning:focus,
 
 spinbutton.warning:not(.vertical) selection, spinbutton.vertical text.warning selection, entry.warning selection { background-color: #f57900; }
 
-spinbutton:not(.vertical) image, spinbutton.vertical text image, entry image { color: #c7c7c6; }
+spinbutton:not(.vertical) > image, spinbutton.vertical text > image, entry > image { color: #c7c7c6; }
 
-spinbutton:not(.vertical) image:hover, spinbutton.vertical text image:hover, entry image:hover { color: #eeeeec; }
+spinbutton:not(.vertical) > image:hover, spinbutton.vertical text > image:hover, entry > image:hover { color: #eeeeec; }
 
-spinbutton:not(.vertical) image:active, spinbutton.vertical text image:active, entry image:active { color: #15539e; }
+spinbutton:not(.vertical) > image:active, spinbutton.vertical text > image:active, entry > image:active { color: #15539e; }
 
-spinbutton:not(.vertical) image:backdrop, spinbutton.vertical text image:backdrop, entry image:backdrop { color: #7e7e7d; }
+spinbutton:not(.vertical) > image:backdrop, spinbutton.vertical text > image:backdrop, entry > image:backdrop { color: #7e7e7d; }
 
 spinbutton.password:not(.vertical) image.caps-lock-indicator, spinbutton.vertical text.password image.caps-lock-indicator, entry.password image.caps-lock-indicator { color: #7e7e7d; }
 

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 89f2e0cd47d433cdb88649521825ec715f371c0f..a7519f607a586f063176013a955f23bd685c0d99 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1,6 +1,6 @@
 * { padding: 0; -gtk-secondary-caret-color: #3584e4; }
 
-button:focus(visible), checkbutton:focus(visible), radiobutton:focus(visible), switch:focus(visible), scale:focus(visible), label:focus(visible), row:focus(visible), flowboxchild:focus(visible) { outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 3px; }
+modelbutton:focus(visible), button:focus(visible), checkbutton:focus(visible), radiobutton:focus(visible), switch:focus(visible), scale:focus(visible), label:focus(visible), row:focus(visible), flowboxchild:focus(visible) { outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 3px; }
 
 /*************** Base States * */
 .background { color: #2e3436; background-color: #f6f5f4; }
@@ -137,13 +137,13 @@ spinbutton.warning:focus:not(.vertical), spinbutton.vertical text.warning:focus,
 
 spinbutton.warning:not(.vertical) selection, spinbutton.vertical text.warning selection, entry.warning selection { background-color: #f57900; }
 
-spinbutton:not(.vertical) image, spinbutton.vertical text image, entry image { color: #585d5e; }
+spinbutton:not(.vertical) > image, spinbutton.vertical text > image, entry > image { color: #585d5e; }
 
-spinbutton:not(.vertical) image:hover, spinbutton.vertical text image:hover, entry image:hover { color: #2e3436; }
+spinbutton:not(.vertical) > image:hover, spinbutton.vertical text > image:hover, entry > image:hover { color: #2e3436; }
 
-spinbutton:not(.vertical) image:active, spinbutton.vertical text image:active, entry image:active { color: #3584e4; }
+spinbutton:not(.vertical) > image:active, spinbutton.vertical text > image:active, entry > image:active { color: #3584e4; }
 
-spinbutton:not(.vertical) image:backdrop, spinbutton.vertical text image:backdrop, entry image:backdrop { color: #a7aaaa; }
+spinbutton:not(.vertical) > image:backdrop, spinbutton.vertical text > image:backdrop, entry > image:backdrop { color: #a7aaaa; }
 
 spinbutton.password:not(.vertical) image.caps-lock-indicator, spinbutton.vertical text.password image.caps-lock-indicator, entry.password image.caps-lock-indicator { color: #a7aaaa; }